From 71dbf1cc0d005fd3efcce90184a883c0a682dadb Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 16 Dec 2024 15:54:23 +0100 Subject: [PATCH] keepalived: add enabled option To prevent the keepalived service from starting if there is no valid configuration yet, the new option enabled is added. This must be set to true for keepalived to start. Signed-off-by: Florian Eckert --- net/keepalived/files/keepalived.config | 1 + net/keepalived/files/keepalived.init | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/net/keepalived/files/keepalived.config b/net/keepalived/files/keepalived.config index 3182518bdb..4410514c42 100644 --- a/net/keepalived/files/keepalived.config +++ b/net/keepalived/files/keepalived.config @@ -1,4 +1,5 @@ config globals 'globals' + option enabled '0' # option alt_config_file "/etc/keepalived/keepalived.conf" # list notification_email "acassen@firewall.loc" # list notification_email "failover@firewall.loc" diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index 20535a4b54..ac59c8103f 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -600,7 +600,6 @@ process_config() { local alt_config_file linkbeat_use_polling rm -f "$KEEPALIVED_CONF" - [ -f /etc/config/keepalived ] || return 0 config_load 'keepalived' config_get alt_config_file globals alt_config_file @@ -654,14 +653,20 @@ reload_service() { } start_service() { + local enabled + + [ -f /etc/config/keepalived ] || return 0 + + config_load 'keepalived' + config_get_bool enabled globals enabled 1 + [ "$enabled" = "0" ] && return 0 + + process_config + procd_open_instance procd_set_param command /usr/sbin/keepalived procd_append_param command -n # don't daemonize, procd will handle that for us procd_append_param command -f "$KEEPALIVED_CONF" - - process_config - - # set auto respawn behavior procd_set_param respawn procd_close_instance } -- 2.30.2